From: Florian Müllner <fmuellner@gnome.org>
Date: Tue, 12 Jul 2011 23:18:58 +0000 (+0200)
Subject: message-tray: Don't update message count after destruction
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8059
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=5f6ac33d5;p=gnome-shell.git

message-tray: Don't update message count after destruction

When trying to update the message count after a summary icon has
been destroyed, the label to display the count is no longer valid
and trying to set its text results in some Clutter warnings.
---

diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index bd55a3133..bf72a0f58 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -885,6 +885,11 @@ Source.prototype = {
         this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
         this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
         this.actor.connect('allocate', Lang.bind(this, this._allocate));
+        this.actor.connect('destroy', Lang.bind(this,
+            function() {
+                this._actorDestroyed = true;
+            }));
+        this._actorDestroyed = false;
 
         this._counterLabel = new St.Label();
         this._counterBin = new St.Bin({ style_class: 'summary-source-counter',
@@ -949,6 +954,9 @@ Source.prototype = {
     },
 
     _updateCount: function() {
+        if (this._actorDestroyed)
+            return;
+
         let count = this.notifications.length;
         this._setCount(count, count > 1);
     },